propose a new tx to cancel the old evm tx that cannot be sent #122
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hundredark
changed the title
There was a problem hiding this comment.
Pull request overview
This PR implements a mechanism to cancel stuck EVM transactions that fail validation on the Gnosis Safe contract but cannot be re-broadcast. When a transaction remains stuck on-chain for more than 30 minutes, it can be marked as stuck and a new cancellation transaction with the same nonce can be proposed to replace it.
Key changes:
- Adds
FlagProposeCancelTransactionto propose cancellation transactions that reuse the stuck transaction's nonce - Introduces a
stuckboolean column in thetransactionstable to track stuck transactions - Modifies transaction broadcasting to detect and mark stuck transactions, then build and send replacement transactions directly
- Removes the deprecated
ActionEthereumSafeRefundTransactionflow in favor of the new cancellation mechanism
Reviewed changes
Copilot reviewed 21 out of 21 changed files in this pull request and generated 7 comments.
Show a summary per file
| File | Description |
|---|---|
| common/request.go | Renumbers transaction flag constants to add FlagProposeCancelTransaction (value 2) and shifts inheritance flags to 3-4 |
| apps/ethereum/account.go | Adds FetchSafeNonce function to retrieve the nonce of a Safe contract at a specific block height |
| apps/ethereum/rpc.go | Updates RPCGetBlockByHeight to return full block details including timestamp |
| apps/ethereum/transaction.go | Adds BuildTransaction method to construct signed transactions without sending them, and updates ValidTransaction to return only error |
| observer/schema.sql | Adds stuck boolean column to transactions table |
| observer/migrate.go | Adds migration to add stuck column and update specific stuck transaction |
| observer/store.go | Updates Transaction model with Stuck field and adds MarkTransactionStuck method; updates queries to handle stuck transactions |
| observer/accountant.go | Refactors ethereumBroadcastTransactionAndWriteDeposit to detect stuck transactions, build replacement transactions, and verify broadcast success |
| observer/ethereum.go | Updates network info loop to use new RPCGetBlockByHeight method |
| observer/node.go | Adds getStuckTxHash helper to retrieve the stuck transaction hash from a cancellation transaction; removes obsolete migration call |
| observer/http.go | Updates transaction endpoint to show "stuck" state for stuck transactions |
| keeper/node.go | Adds getTransactionFlagAndExtra helper and migration call |
| keeper/group.go | Removes handling for deprecated ActionEthereumSafeRefundTransaction |
| keeper/ethereum.go | Implements cancellation transaction proposal and approval logic; validates stuck transactions and creates replacement transactions with same nonce |
| keeper/ethereum_test.go | Adds test for cancellation transaction flow; removes test for deprecated refund action |
| keeper/bitcoin.go | Updates to use new signature method signature and refactored inheritance lock helper |
| keeper/store/transaction.go | Adds CancelPrevious field to Transaction struct; removes deprecated FailTransactionWithRequest method |
| keeper/store/signature.go | Updates FinishTransactionSignaturesWithRequest to skip nonce increment for cancellation transactions |
| keeper/store/request.go | Refactors ReadRequest to use helper method for reuse |
| keeper/store/migrate.go | Adds migration to fix specific stuck transaction state and balances |
| signer/ethereum_test.go | Adds tests for FetchSafeNonce at various block heights |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
observer/accountant.go
Outdated
| if err != nil { | ||
| panic(err) | ||
| } | ||
| time.Sleep(time.Second * 30) |
There was a problem hiding this comment.
The code sleeps for 30 seconds after sending the transaction before checking if it's in the mempool. This hardcoded delay may be too long for fast networks or too short for congested networks. Consider making this configurable or using an exponential backoff strategy.
cedricfung
requested changes
Dec 26, 2025
| if err != nil { | ||
| return nil, nil, err | ||
| } | ||
| defer conn.Close() |
Contributor
There was a problem hiding this comment.
This connection should not be returned, and also already closed.
apps/ethereum/transaction.go
Outdated
| return conn, t, nil | ||
| } | ||
|
|
||
| func (tx *SafeTransaction) ExecTransaction(ctx context.Context, rpc, key string) (string, error) { |
Contributor
There was a problem hiding this comment.
This function could be removed, and add SendAndWaitMined?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.